Merge version 1:11.8.6-4+rpi1 and 1:11.8.6-5 to produce 1:11.8.6-5+rpi1

diff --cc debian/changelog
index 7a81b5a75ec37484d1d7b4a7ee752d12b5865ef2,49f5a8a6d7f401c514481af90dc8e6fea2e5c61d..0f9ba1c6614dc6de843f434cbeae570c893128af
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,33 @@@
- mariadb (1:11.8.6-4+rpi1) forky-staging; urgency=medium
++mariadb (1:11.8.6-5+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1:11.8.6-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 05 Mar 2026 22:49:06 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Mar 2026 16:10:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 05 Apr 2026 19:12:50 +0000
++
+ mariadb (1:11.8.6-5) unstable; urgency=medium
+ 
+   * New mariadb-server installs will now use /var/lib/mariadb as the default
+     data directory. See NEWS for details.
+     - Determine whether to use /var/lib/mysql or /var/lib/mariadb during
+       mariadb-server preinst and postinst.
+     - On purge, remove /var/lib/mariadb, and /var/lib/mysql only if owned by
+       mariadb.
+     - d/p/set-default-datadir-to-var-lib-mariadb.patch: Update compile-time
+       INSTALL_MYSQLDATADIR_DEB setting to /var/lib/mariadb.
+     - d/mariadb-server.mariadb.init: Default to /var/lib/mariadb if datadir is
+       not specified in config.
+     - d/additions/50-server.cnf: Update default datadir in comment to
+       /var/lib/mariadb.
+     - Update autopkgtests to match new data directory expectations.
+     - Apport: Include /var/lib/mariadb data directory info in report.
+     - Salsa CI: Confirm correct datadir is in use for each test and add list of
+       /var/lib/mariadb files as test artifact.
+   * Use mariadb_upgrade_info/mysql_upgrade_info version files instead of
+     generated flag files to detect active data directory and downgrade
+     attempts.
+ 
+  -- Lena Voytek <lena@voytek.dev>  Tue, 24 Mar 2026 09:26:38 -0400
  
  mariadb (1:11.8.6-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge